Add install-info dependency.

diff --git a/debian/changelog b/debian/changelog
index 5956bb716ede06bc24fc4a8347b7d02cb102f0fa..0d28bb90b781b551463b9fe7677e60678befd4cf 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+emacs23 (23.1+1-2) unstable; urgency=low
+
+  * Add dependencies on install-info to primary binary packages and
+    remove install-info from meta package provides.  Thanks to Norbert
+    Preining <preining@logic.at>.  (See emacs21 bugs #532600, #532599,
+    #532597, and #532602.)
+
+ -- Rob Browning <rlb@defaultvalue.org>  Sun, 02 Aug 2009 11:34:18 -0700
+
 emacs23 (23.1+1-1) unstable; urgency=low
 
   * New emacs23 packages.

diff --git a/debian/control b/debian/control
index 21913264d2c316641a578997d7eade38cec7973c..5eea704fb8036aee90e6895a55769380df5e4610 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Section: editors
 Priority: optional
 Architecture: all
 Depends: emacs23 | emacs23-gtk | emacs23-nox
-Provides: emacsen, editor, info-browser, mail-reader, news-reader
+Provides: emacsen, editor, mail-reader, news-reader
 Description: The GNU Emacs editor (metapackage)
  GNU Emacs is the extensible self-documenting text editor.
  This is a metapackage which will always depend on the latest Emacs
@@ -21,7 +21,7 @@ Package: emacs23
 Section: editors
 Priority: optional
 Architecture: any
-Depends: emacs23-bin-common (= ${binary:Version}), ${shlibs:Depends}
+Depends: emacs23-bin-common (= ${binary:Version}), install-info, ${shlibs:Depends}
 Provides: emacsen, editor, info-browser, mail-reader, news-reader
 Suggests: emacs23-common-non-dfsg
 Conflicts: emacs23-nox, emacs23-gtk, w3-el
@@ -33,7 +33,7 @@ Package: emacs23-nox
 Section: editors
 Priority: optional
 Architecture: any
-Depends: emacs23-bin-common (= ${binary:Version}), ${shlibs:Depends}
+Depends: emacs23-bin-common (= ${binary:Version}), install-info, ${shlibs:Depends}
 Provides: emacs23, editor, emacsen, info-browser, mail-reader, news-reader
 Suggests: emacs23-common-non-dfsg
 Conflicts: emacs23, emacs23-gtk, w3-el
@@ -46,7 +46,7 @@ Package: emacs23-gtk
 Section: editors
 Priority: optional
 Architecture: any
-Depends: emacs23-bin-common (= ${binary:Version}), ${shlibs:Depends}
+Depends: emacs23-bin-common (= ${binary:Version}), install-info, ${shlibs:Depends}
 Provides: emacs23, editor, emacsen, info-browser, mail-reader, news-reader
 Suggests: emacs23-common-non-dfsg
 Conflicts: emacs23, emacs23-nox, w3-el

diff --git a/debian/control.in b/debian/control.in
index b3bd15dfc124ab95d6f54fe9132279706974ca54..75ac7fe10edd28d7db2e88f85f11c84fbd6896ef 100644 (file)
--- a/debian/control.in
+++ b/debian/control.in
@@ -11,7 +11,7 @@ Section: editors
 Priority: optional
 Architecture: all
 Depends: @DEB_FLAVOR@ | @DEB_FLAVOR@-gtk | @DEB_FLAVOR@-nox
-Provides: emacsen, editor, info-browser, mail-reader, news-reader
+Provides: emacsen, editor, mail-reader, news-reader
 Description: The GNU Emacs editor (metapackage)
  GNU Emacs is the extensible self-documenting text editor.
  This is a metapackage which will always depend on the latest Emacs
@@ -21,7 +21,7 @@ Package: @DEB_FLAVOR@
 Section: editors
 Priority: optional
 Architecture: any
-Depends: @DEB_FLAVOR@-bin-common (= ${binary:Version}), ${shlibs:Depends}
+Depends: @DEB_FLAVOR@-bin-common (= ${binary:Version}), install-info, ${shlibs:Depends}
 Provides: emacsen, editor, info-browser, mail-reader, news-reader
 Suggests: @DEB_FLAVOR@-common-non-dfsg
 Conflicts: @DEB_FLAVOR@-nox, @DEB_FLAVOR@-gtk, w3-el
@@ -33,7 +33,7 @@ Package: @DEB_FLAVOR@-nox
 Section: editors
 Priority: optional
 Architecture: any
-Depends: @DEB_FLAVOR@-bin-common (= ${binary:Version}), ${shlibs:Depends}
+Depends: @DEB_FLAVOR@-bin-common (= ${binary:Version}), install-info, ${shlibs:Depends}
 Provides: @DEB_FLAVOR@, editor, emacsen, info-browser, mail-reader, news-reader
 Suggests: @DEB_FLAVOR@-common-non-dfsg
 Conflicts: @DEB_FLAVOR@, @DEB_FLAVOR@-gtk, w3-el
@@ -46,7 +46,7 @@ Package: @DEB_FLAVOR@-gtk
 Section: editors
 Priority: optional
 Architecture: any
-Depends: @DEB_FLAVOR@-bin-common (= ${binary:Version}), ${shlibs:Depends}
+Depends: @DEB_FLAVOR@-bin-common (= ${binary:Version}), install-info, ${shlibs:Depends}
 Provides: @DEB_FLAVOR@, editor, emacsen, info-browser, mail-reader, news-reader
 Suggests: @DEB_FLAVOR@-common-non-dfsg
 Conflicts: @DEB_FLAVOR@, @DEB_FLAVOR@-nox, w3-el